merge emacs-24
authorKenichi Handa <handa@gnu.org>
Fri, 7 Dec 2012 11:49:09 +0000 (20:49 +0900)
committerKenichi Handa <handa@gnu.org>
Fri, 7 Dec 2012 11:49:09 +0000 (20:49 +0900)

Trivial merge